updated version to 1.2.0-SNAPSHOT
Update strings.xml
version back to 1.1.3 for a new tag
version back to 1.1.4-SNAPSHOT
Merge branch 'geocat_1.1.x' into geocat_trunk