get area handle and name through method which is easier to override
Merge branch 'master' of https://github.com/concrete5/concrete5
Merge branch 'master' of https://github.com/Remo/concrete5
get area handle and name through method which is easier to override
Revert "get area handle and name through method which is easier to override"

This reverts commit 3804e97eea47c29d944dfcd34c9f62c09a478e1b.
Merge branch 'master' of https://github.com/Remo/concrete5.git
Merge branch 'master' of https://github.com/Remo/concrete5
Merge branch 'master' of git://github.com/concrete5/concrete5.git
Merge branch 'master' of https://github.com/Remo/concrete5

Conflicts:
	web/concrete/core/models/permission/cache.php
Merge branch 'master' of https://github.com/Remo/concrete5.git
Merge branch 'master' of https://github.com/Remo/concrete5

Conflicts:
	.gitignore
	build/Gruntfile.js
	build/README.md
	web/concrete/elements/block_area_footer.php
	web/concrete/helpers/concrete/dashboard/sitemap.php
	web/concrete/js/bootstrap.js
	web/concrete/js/ccm.app.js
	web/concrete/js/ccm.dashboard.js
	web/concrete/js/jquery.cookie.js
	web/concrete/single_pages/dashboard/pages/types/add.php
	web/concrete/single_pages/dashboard/users/add.php
	web/concrete/tools/files/import.php
	web/concrete/tools/pages/permissions_access.php
	web/concrete/tools/select_group.php