Semi fix for issue #11
merge #15

Conflicts:
	app/scripts/main.js