Merge pull request #28 from browles/feat/autocomplete

Feat/autocomplete
Merge branch 'master' of https://github.com/GoldenLions/Artproject

Conflicts:
	client/www/scripts/controllers/mainController.js
	client/www/scripts/services/userServices.js
Merge branch 'master' of https://github.com/GoldenLions/Artproject

Conflicts:
	client/www/scripts/controllers/mainController.js
Merge branch 'master' of https://github.com/GoldenLions/Artproject
Merge branch 'master' of https://github.com/GoldenLions/Artproject

Conflicts:
	client/www/scripts/controllers/mainController.js
	client/www/views/search.html
Merge branch 'master' of https://github.com/GoldenLions/Artproject
Merge branch 'master' of https://github.com/GoldenLions/Artproject
ngModel autocomplete in sync
Merge pull request #42 from browles/master

ngmodel