Source level 1.5 is added along with maven compiler plugin in order to have support for annotations
Merge remote-tracking branch 'remotes/amir343/master'

Conflicts:
	pom.xml