made active admin
Merge branch 'master' of https://github.com/rauljordan/synapse

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/views/layouts/application.html.erb
	config/database.yml
	config/environments/development.rb
	config/environments/test.rb
	config/initializers/devise.rb
	config/initializers/secret_token.rb
	config/routes.rb
	db/schema.rb