Merge branch 'jonas' of https://github.com/AreWeThereYeti/BetApp into jonas

Conflicts:
	index.html
Merge branch 'jonas' of https://github.com/AreWeThereYeti/BetApp into jonas
Revert 5f85ef0..e3e6e76

This rolls back to commit 5f85ef0e0b9ca9122f48042d51a143348e59e5af.
full form
Merge branch 'jonas' of https://github.com/AreWeThereYeti/BetApp into jonas

Conflicts:
	index.html
hgf
Merge branch 'jonas' of https://github.com/AreWeThereYeti/BetApp into jonas

Conflicts:
	index.html
Revert dc98dd5..d382a4b

This rolls back to commit dc98dd52cb708e43e9feb4d4f6fd2c8aecfccc18.
Merge branch 'mikkel'
Merge branch 'master' into jonas

Conflicts:
	index.html
Merge branch 'mikkel'
Merge branch 'master' into jonas

Conflicts:
	index.html
Merge branch 'mikkel' into jonas
now retrieves localDB list elements at startup
Merge branch 'jonas'
Merge branch 'master' into mikkel

Conflicts:
	src/js/angular/Controller.js