Added Spring-Security to project pom and some clean-up.
Added Spring-Security to project pom and some clean-up.

* re-ordering some of the items, so that related items hopefully are close to eachother.
* Fixed some weird import of Servlet dependencies, two versions conflicting (I think).

we4sz/DAT076,we4sz/DAT076