using ember cli
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.gitignore
	index.html
	tests/tests.js