v.1.2

Edit through annotation
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/main/webapp/WEB-INF/dispatcher-database.xml
	src/main/webapp/WEB-INF/dispatcher-servlet.xml