added projects & cards
Merge branch 'master' into angularize_project

Conflicts:
	config/routes.rb