#114
Merge branch 'master' of https://github.com/getsmap/smap-mobile

Conflicts:
	bower.json