Change in Application.java
Merge branch 'master' of github.com:zanox/workshop-rebasevsmerge into BR-2
changes added
Fixed conflicts
test
Merge branch 'master' of github.com:zanox/workshop-rebasevsmerge
added content
Remove property
Change version
Merge branch 'master' of github.com:zanox/workshop-rebasevsmerge
Merge branch 'master' of github.com:zanox/workshop-rebasevsmerge