adminStart
Merge branch 'admin'

Conflicts:
	videostore/src/main/java/rs/code9/videostore/controller/AdminController.java
Merge branch 'master' of https://github.com/infproj/infproj.git
admindeo
Merge branch 'master' of https://github.com/infproj/infproj.git

Conflicts:
	videostore/src/main/webapp/WEB-INF/tiles-def/tiles.xml