Update bower.json
update to branch that exists.
Update bower.json
Merge branch 'moki' of https://github.com/MokiMobility/ng-boilerplate-client-modules into moki
Merge pull request #7 from jaredmaxwell/patch-1

Update bower.json
Update bower.json
use .6 version
lame
added query string service
bower
bower release crap
bower update
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
Merge remote-tracking branch 'origin/moki'

Conflicts:
	bower.json
Merge branch 'master' of https://github.com/MokiMobility/ng-boilerplate-client-modules

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

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