admin

admin
Merge branch 'master' of https://github.com/firashosn/peer4m

Conflicts:
	app/controllers/admin_controller.rb