move context:* from applicationContext.xml to dispatcher-servlet.xml
Merge branch 'master' into mark-master
Merge pull request #46 from yllekkram/mark-master

Cleaned up some code