Merge remote-tracking branch 'origin/master'

Conflicts:
	pedibox/www/js/controllers.js