Merge pull request #1 from Make-Magazine/projects

Projects integration with base api and search
Update README.md
Update README.md
Update README.md
merging changes
Merge pull request #2 from Make-Magazine/projects

Projects into develop
fixing the project search
made some changes to login
Merge branch 'login_flow' into develop

* login_flow:
  made some changes to login
pass reset and top register form
Merge branch 'auth-forms' into develop

* auth-forms:
  pass reset and top register form
  Added categories
  Added a projects table

Conflicts:
	app/assets/stylesheets/theme.css.scss
	app/assets/stylesheets/welcome.css.scss
	app/views/welcome/index.html.erb
first registration flow step
Update README.md
Update README.md
fixing our font icon setup: moved to icomoon for full control
uh, changed some white space
some navbar stuff
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop

Conflicts:
	app/views/shared/_main_nav.html.erb
	config/routes.rb
adding or key in the devise because it whines on rake routes.
Update merge with new UI