add comment about possible conflicts when merging PMs
update Grails spring config
update to gradle 1.5
improve javadoc of ModelStore
resolve some cross-compilation issues in client-javafx binding
DOL-95 allow custom tags. Tags are no longer enums but constants of the Tag class.
Merge remote-tracking branch 'origin/master'

Conflicts:
	subprojects/client-javafx/src/main/groovy/org/opendolphin/binding/JFXBinder.groovy
resolving merge conflicts by retrofitting some usages of "using" in bind chains. Needs more investigation.