updated style changes
changed r.java to ignore
r.java commit second attempt
Merge branch 'style_updates'

Conflicts:
	Playerz.Android/gen/com/pointpadz/playerz/android/R.java
Merge branch 'master' of https://github.com/Claies/Playerz.Server

Conflicts:
	Playerz.Android/.apt_generated/com/pointpadz/playerz/activities/CreateCompanyActivity_.java
	Playerz.Android/.apt_generated/com/pointpadz/playerz/activities/CreateGameroomActivity_.java
	Playerz.Android/.apt_generated/com/pointpadz/playerz/activities/RegisterActivity_.java
	Playerz.Android/.apt_generated/com/pointpadz/playerz/android/RestClient_.java
	Playerz.Android/bin/classes/com/pointpadz/playerz/android/R$id.class
	Playerz.Android/bin/classes/com/pointpadz/playerz/android/R$layout.class
	Playerz.Android/bin/classes/com/pointpadz/playerz/android/R$menu.class
	Playerz.Android/bin/classes/com/pointpadz/playerz/android/R$string.class
	Playerz.Android/bin/classes/com/pointpadz/playerz/android/R$style.class
	Playerz.Android/bin/classes/com/pointpadz/playerz/android/RestClient_.class
	Playerz.Android/res/layout/admin_dashboard.xml
	Playerz.Android/res/values/strings.xml
	Playerz.Android/src/com/pointpadz/playerz/fragments/Login.java
	playerzServer/target-eclipse/classes/BootStrap.class
	playerzServer/target-eclipse/classes/DbdocUrlMappings.class
	playerzServer/target-eclipse/classes/JQueryResourceTagLib.class
	playerzServer/target-eclipse/classes/JQueryService.class
	playerzServer/target-eclipse/classes/JQueryTagLib.class
	playerzServer/target-eclipse/classes/ResourcesBootStrap.class
	playerzServer/target-eclipse/classes/UrlMappings.class
	playerzServer/target-eclipse/classes/grails/plugin/cache/CacheTagLib.class
	playerzServer/target-eclipse/classes/grails/plugin/cache/ConfigLoader.class
	playerzServer/target-eclipse/classes/grails/plugin/cache/GrailsCacheAdminService.class
	playerzServer/target-eclipse/classes/grails/plugin/cloudfoundry/AbstractServiceInfo.class
	playerzServer/target-eclipse/classes/grails/plugin/cloudfoundry/AppCloudEnvironment.class
	playerzServer/target-eclipse/classes/grails/plugin/cloudfoundry/ApplicationInstanceInfo.class
	playerzServer/target-eclipse/classes/grails/plugin/cloudfoundry/CloudFoundryTagLib.class
	playerzServer/target-eclipse/classes/grails/plugin/cloudfoundry/CloudFoundryUtils.class
	playerzServer/target-eclipse/classes/grails/plugin/cloudsupport/AbstractCloudBeanPostprocessor.class
	playerzServer/target-eclipse/classes/grails/plugin/cloudsupport/AbstractCloudTagLib.class
	playerzServer/target-eclipse/classes/grails/plugin/cloudsupport/AbstractMongoBeanConfigurer.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/ChangelogXml2Groovy.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/DbdocController.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/DslBuilder$1.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/GormDatabaseSnapshotGenerator.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/GrailsChange$1.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/GrailsChangeLogParser.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/GrailsClassLoaderResourceAccessor.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/GrailsDiffStatusListener.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/GrailsPrecondition$1.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/GrailsPrecondition.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/GroovyAwareStringChangeLogSerializer.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/Log4jLogger.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/MigrationRunner.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/MigrationUtils.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/MysqlAwareCreateTableGenerator.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/ScriptUtils.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/dbdoc/ChangeLogWriter.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/dbdoc/HTMLListWriter.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/dbdoc/HTMLWriter.class
	playerzServer/target-eclipse/classes/grails/plugin/databasemigration/dbdoc/MemoryDocVisitor.class
	playerzServer/target-eclipse/classes/grails/plugin/webxml/FilterManager.class
	playerzServer/target-eclipse/classes/org/apache/shiro/authc/credential/PasswordHashAdapter.class
	playerzServer/target-eclipse/classes/org/apache/shiro/grails/AccessControlBuilder.class
	playerzServer/target-eclipse/classes/org/apache/shiro/grails/ConfigUtils.class
	playerzServer/target-eclipse/classes/org/apache/shiro/grails/FilterAccessControlBuilder.class
	playerzServer/target-eclipse/classes/org/apache/shiro/grails/ShiroAnnotationHandlerService.class
	playerzServer/target-eclipse/classes/org/apache/shiro/grails/ShiroFilters.class
	playerzServer/target-eclipse/classes/org/apache/shiro/grails/ShiroSecurityService.class
	playerzServer/target-eclipse/classes/org/apache/shiro/grails/ShiroTagLib.class
	playerzServer/target-eclipse/classes/org/codehaus/groovy/grails/plugins/jquery/JQueryConfig.class
	playerzServer/target-eclipse/classes/org/codehaus/groovy/grails/plugins/jquery/JQueryProvider.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/BundleResourceMapper.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/CSSLinkProcessor.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/CSSPreprocessorResourceMapper.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/CSSRewriterResourceMapper.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/DevModeSanityFilter.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/ProcessingFilter.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/ResourceMeta.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/ResourceModule.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/ResourceProcessor.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/ResourceProcessorBatch.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/ResourceTagLib.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/URLUtils.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/mapper/MapperPhase.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/mapper/ResourceMapper.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/mapper/ResourceMappersFactory.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/module/ModuleBuilder.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/module/ModuleDeclarationsFactory.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/module/ModulesBuilder.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/util/HalfBakedLegacyLinkGenerator.class
	playerzServer/target-eclipse/classes/org/grails/plugin/resource/util/ResourceMetaStore.class
	playerzServer/target-eclipse/classes/playerzserver/Admin.class
	playerzServer/target-eclipse/classes/playerzserver/AdminTests.class
	playerzServer/target-eclipse/classes/playerzserver/AuthController.class
	playerzServer/target-eclipse/classes/playerzserver/BootstrapService.class
	playerzServer/target-eclipse/classes/playerzserver/BootstrapServiceTests.class
	playerzServer/target-eclipse/classes/playerzserver/Company.class
	playerzServer/target-eclipse/classes/playerzserver/CompanyController$_list_closure1.class
	playerzServer/target-eclipse/classes/playerzserver/CompanyController.class
	playerzServer/target-eclipse/classes/playerzserver/CompanyControllerTests.class
	playerzServer/target-eclipse/classes/playerzserver/CompanyService.class
	playerzServer/target-eclipse/classes/playerzserver/CompanyServiceTests.class
	playerzServer/target-eclipse/classes/playerzserver/CompanyTests.class
	playerzServer/target-eclipse/classes/playerzserver/Employee.class
	playerzServer/target-eclipse/classes/playerzserver/Gameroom.class
	playerzServer/target-eclipse/classes/playerzserver/GameroomController.class
	playerzServer/target-eclipse/classes/playerzserver/GameroomControllerTests.class
	playerzServer/target-eclipse/classes/playerzserver/GameroomService.class
	playerzServer/target-eclipse/classes/playerzserver/GameroomServiceTests.class
	playerzServer/target-eclipse/classes/playerzserver/GameroomTests.class
	playerzServer/target-eclipse/classes/playerzserver/Pad.class
	playerzServer/target-eclipse/classes/playerzserver/PadController.class
	playerzServer/target-eclipse/classes/playerzserver/PadControllerTests.class
	playerzServer/target-eclipse/classes/playerzserver/PadTests.class
	playerzServer/target-eclipse/classes/playerzserver/RestController.class
	playerzServer/target-eclipse/classes/playerzserver/RestControllerTests.class
	playerzServer/target-eclipse/classes/playerzserver/RoleService.class
	playerzServer/target-eclipse/classes/playerzserver/RoleServiceTests.class
	playerzServer/target-eclipse/classes/playerzserver/SecRole.class
	playerzServer/target-eclipse/classes/playerzserver/SecSecurityFilters.class
	playerzServer/target-eclipse/classes/playerzserver/SecUser.class
	playerzServer/target-eclipse/classes/playerzserver/UserService.class
	playerzServer/target-eclipse/classes/playerzserver/UserServiceTests.class