-merged
- merged
Merge branch 'master' of https://github.com/mmonti/bt-parent.git

Conflicts:
	bt-admin/src/main/java/com/beyondtag/admin/config/local/LocalWebMvcConfigurer.java
changed readonly attributes