#24 Small mistype fixes, removed unused namespaces
Merge branch 'dev' into dev-users

Conflicts:
	Sandbox/BetterCms.Sandbox.Mvc4/BetterCms.Sandbox.Mvc4.csproj
#24: on start event added into user module for permissions registration.
created html/css for issue #545
commit added to the new branch "dev-1.3.0"
Merge branch 'dev' into dev-1.3.0
Add user access control module.
#574: media upload cancel updated.
Merge branch 'dev' into dev-1.3.0
+ #535 Created DB structure and UI for managing layout options

Conflicts:
	BetterCms.sln
	packages/repositories.config
Merge branch 'dev' into dev-1.3.0
+ #577 ContentOptionTypes table renamed to OptionTypes

Conflicts:
	BetterCms.sln
	packages/repositories.config
Merge branch 'dev-1.3.0' of github.com:devbridge/BetterCMS into dev-1.3.0
Add MigrationVersionMetaData and reference access control module.
Merge branch 'dev-1.3.0' of github.com:devbridge/BetterCMS into dev-1.3.0
#574: fix for undefined reuploadMediaId.
Add UserAccessMap tests and access control service tests.
Add access control enabled flag to cms configuration.
Check access level before serving page or file.
#535 Created DB structure and UI for managing layout options; JavaScript modifications; inline editor modifications; removed old unused classes; refactored logic of deleting template;
Merge branch 'dev-1.3.0' of github.com:devbridge/BetterCMS into dev-1.3.0
#535 Layout options: when saving template, also saving template options
#576 Pages: created table for page options, grid and service method for getting the values (also used in content option values)