Merge pull request #16 from Make-Magazine/develop

Develop
Control all the things

line 3 of card is trying unsuccessfully to replace that string, advice
please?
adding api, user interests
adding unique constraints to user_to_categories on both user_id and category_id
adding v1 interest controller to api
renaming things
testing current requests.
interests controller works with category_name
setting up framework for front-end for @www
new profile box
changing sessions store for work across subdomains -- clear your cookies
Push It baby
Merge branch 'projects' into develop
merge fixes
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop

Conflicts:
	app/views/shared/_main_nav.html.erb
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop

* 'develop' of https://github.com/Make-Magazine/makerapp:
  Push It baby
  Control all the things
merge fix
dont render json
var change
tags styling and js on interests page