Updated spacing.
Merge branch 'master' into tinymce
Moved security of controllers into the actions.
Updated dependancy injection.
Updated to set tinymce and master as 2.0 for dependency requirements.
Updated composer to remove extra setting
Removed bad setting of tinymce import from extension.
Updated config to import tinymce configuration.
Updated tinymce configuration to work with updated tinymce.
Updated User mapping so is correct.
Added access exception to user controller.
Added import for tinymce configuration. Changed import of services to be run from the services.xml
Updated so that the Extension file includes the additional file configurations once the Console bundle has been included.
Merged view changes form master branch into tinymce branch.
Updated and added form Types into the Form folder from master.
Merged in console css changes. Updated tinymce to work with new update.
Updated tinymce settings to display for body and excerpt fields.
Updated list of icons to include in the tinymce setup.
Merge branch 'master' of github.com:frodosghost/ConsoleBundle into tinymce
Merge branch 'tinymce' of github.com:frodosghost/ConsoleBundle into tinymce

Conflicts:
	DependencyInjection/Configuration.php
	DependencyInjection/ManhattanConsoleExtension.php
	Resources/config/services.xml
	Resources/config/tinymce.yml
Updated readme and composer to include correct bundles.
Removed configuration for publish_states.
Merge branch 'tinymce' of git://github.com/frodosghost/ConsoleBundle into tinymce