update to branch that exists.
Update bower.json
Merge branch 'moki' of https://github.com/MokiMobility/ng-boilerplate-client-modules into moki
Update bower.json
use .6 version
lame
added query string service
bower release crap
reverting dumb decision
adding coffee to local components
Merge remote-tracking branch 'origin/moki' into moki

Conflicts:
	bower.json
Merge branch 'moki' of https://github.com/j-walker23/ng-boilerplate-client-modules into moki

Conflicts:
	bower.json