Added is admin
Added is_Admin to rake

this allows people to test the cms too.
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop

Conflicts:
	db/schema.rb