Create initial tests for historyController
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	test/specs/app/appTest.js
Add test to historyController