new updates ~leph
Merge branch 'master' of https://github.com/crowdpublishtv/alpha

Conflicts:
	config/routes.rb