Cleaning java code
Merge branch 'development' of github.com:encuestame/encuestame into development
Merge branch 'development' of github.com:encuestame/encuestame into development
Migrated to Spring 4.0.RELEASE