.
Merge branch 'master' of https://github.com/dkraczkowski/kw-mobile

Conflicts:
	src/js/app.js