first replacement with custom tags. fixed unchanged checkbox names
Merge branch 'refactor' of github.com:geosolutions-it/fra2015 into refactor
Manage Add and Update user in admin section
Merge branch 'refactor' of git://github.com/xandros6/fra2015 into xandros6-refactor
default overrider commented