ok
Merge branch 'master' of https://github.com/nonumber1989/SevenUp.git

Conflicts:
	logs/restcountries.log
	sevenup-server/logs/restcountries.log
	sevenup-server/target/m2e-wtp/web-resources/META-INF/maven/org.sevenup/sevenup-server/pom.properties
ok
changes