Initial commit
Merge branch 'master' of https://github.com/ProjectWaffle/framework.git

Conflicts:
	pom.xml