First design
Merge branch 'master' of github.com:Lutarony/Lutarony

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/Lutarony/Lutarony/pom.properties