Added Attributes setting page
Merge branch 'master' of https://github.com/sitemavens/maven-common

Conflicts:
	app/admin/admin-initializer.php
	app/maven.php
	app/views/admin/admin.php