fix/ name
fix/ version double
merge
merge
fix/ user name
Merge https://github.com/ristargomel/interstitial

Conflicts:
	app/models/Platform.java
	tmp/bytecode/DEV/DocViewerPlugin
	tmp/bytecode/DEV/_app_views_errors_404.html
	tmp/bytecode/DEV/_module_crud__app_views_CRUD_blank.html
	tmp/bytecode/DEV/_module_crud__app_views_CRUD_index.html
	tmp/bytecode/DEV/_module_crud__app_views_CRUD_layout.html
	tmp/bytecode/DEV/_module_crud__app_views_CRUD_list.html
	tmp/bytecode/DEV/_module_crud__app_views_tags_crud_form.html
	tmp/bytecode/DEV/_module_crud__app_views_tags_crud_navigation.html
	tmp/bytecode/DEV/_module_crud__app_views_tags_crud_pagination.html
	tmp/bytecode/DEV/_module_crud__app_views_tags_crud_relationField.html
	tmp/bytecode/DEV/_module_crud__app_views_tags_crud_search.html
	tmp/bytecode/DEV/_module_crud__app_views_tags_crud_table.html
	tmp/bytecode/DEV/_module_crud__app_views_tags_crud_textField.html
	tmp/bytecode/DEV/_module_crud__app_views_tags_crud_types.tag
	tmp/bytecode/DEV/_module_crud__conf_routes
	tmp/bytecode/DEV/_module_secure__app_views_Secure_layout.html
	tmp/bytecode/DEV/_module_secure__app_views_Secure_login.html
	tmp/bytecode/DEV/_play__framework_templates_tags_404.html
	tmp/bytecode/DEV/controllers.Admin
	tmp/bytecode/DEV/controllers.Bootstrap
	tmp/bytecode/DEV/controllers.CRUD
	tmp/bytecode/DEV/controllers.CRUD$Exclude
	tmp/bytecode/DEV/controllers.CRUD$For
	tmp/bytecode/DEV/controllers.CRUD$Hidden
	tmp/bytecode/DEV/controllers.CRUD$ObjectType
	tmp/bytecode/DEV/controllers.CRUD$ObjectType$ObjectField
	tmp/bytecode/DEV/controllers.Chains
	tmp/bytecode/DEV/controllers.Check
	tmp/bytecode/DEV/controllers.Countrys
	tmp/bytecode/DEV/controllers.Platforms
	tmp/bytecode/DEV/controllers.PlayDocumentation
	tmp/bytecode/DEV/controllers.Secure
	tmp/bytecode/DEV/controllers.Secure$Security
	tmp/bytecode/DEV/controllers.Security
	tmp/bytecode/DEV/controllers.Steps
	tmp/bytecode/DEV/controllers.Templates
	tmp/bytecode/DEV/controllers.UserGroups
	tmp/bytecode/DEV/controllers.UserStatuss
	tmp/bytecode/DEV/controllers.Users
	tmp/bytecode/DEV/controllers.Versions
	tmp/bytecode/DEV/helpers.CheatSheetHelper
	tmp/bytecode/DEV/helpers.CheatSheetHelper$1
	tmp/bytecode/DEV/helpers.CheatSheetHelper$2
	tmp/bytecode/DEV/helpers.CheatSheetHelper$3
	tmp/bytecode/DEV/models.Chain
	tmp/bytecode/DEV/models.Country
	tmp/bytecode/DEV/models.Platform
	tmp/bytecode/DEV/models.Step
	tmp/bytecode/DEV/models.Template
	tmp/bytecode/DEV/models.User
	tmp/bytecode/DEV/models.UserGroup
	tmp/bytecode/DEV/models.UserGroupAccess
	tmp/bytecode/DEV/models.UserStatus
	tmp/bytecode/DEV/models.Version
	tmp/classes/controllers/Admin.class
	tmp/classes/controllers/CRUD$ObjectType$ObjectField.class
	tmp/classes/controllers/CRUD$ObjectType.class
	tmp/classes/controllers/CRUD.class
	tmp/classes/controllers/Chains.class
	tmp/classes/controllers/Countrys.class
	tmp/classes/controllers/Platforms.class
	tmp/classes/controllers/PlayDocumentation.class
	tmp/classes/controllers/Secure$Security.class
	tmp/classes/controllers/Secure.class
	tmp/classes/controllers/Security.class
	tmp/classes/controllers/Steps.class
	tmp/classes/controllers/Templates.class
	tmp/classes/controllers/UserGroups.class
	tmp/classes/controllers/UserStatuss.class
	tmp/classes/controllers/Users.class
	tmp/classes/controllers/Versions.class
	tmp/classes/models/Platform.class
	tmp/classes/models/Template.class
merge
Merge https://github.com/ristargomel/interstitial
merge