Merge branch 'master' of https://github.com/cescoff/untitled2

Conflicts:
	.idea/compiler.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/workspace.xml
Merge branch 'master' of https://github.com/cescoff/untitled2

Conflicts:
	.idea/modules.xml
	pom.xml