Add entities and repositories
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/softensity/entity/Template.java