Added required frameworks to web module
Merge remote-tracking branch 'origin/master'
Added spring security, rearranged dependencies,