Update code
Merge remote-tracking branch 'origin/master'

Conflicts:

	Source/ExampleProject/target/m2e-wtp/web-resources/META-INF/maven/com.lycato/controller/pom.properties