Update controller names
Rename server 'components' folder to api
rename config/config.js to config/index
Move fixtures into config/sampledata.js
Merge branch 'master' into passport

Conflicts:
	client/components/navbar/navbar.controller.js
	client/index.html
	server/api/thing/thing.fixture.js
	server/api/thing/thing.model.js
	server/app.js
	server/components/thing/thing.fixture.js
	server/config/env/all.js
	server/config/express.js
	server/config/index.js
	server/config/sampledata.js
	server/routes.js