Applying Spring Security
Merge branch 'master' of https://github.com/trungnguyenn/contacts

Conflicts:
	src/main/resources/import.sql