Update controller names
Rename server 'components' folder to api
Rename server components to api
Merge branch 'master' into socketio

Conflicts:
	client/app/main/main.controller.js
	client/index.html
Rename server 'components' folder to api
Merge branch 'master' into socketio