Changes made by Martin Jespersen (mjatzbox@gmail.com).
Merge branch 'master' of https://github.com/djaevlen/DickoApp

Conflicts:
	DickoApp/index.html
Changes made by Martin Jespersen (mjatzbox@gmail.com).
Merge branch 'master' of https://github.com/djaevlen/DickoApp
Merge branch 'master' of https://github.com/djaevlen/DickoApp
Merge branch 'master' of https://github.com/djaevlen/DickoApp
Merge branch 'master' of https://github.com/djaevlen/DickoApp
Changes made by Martin Jespersen (mjatzbox@gmail.com).
Merge branch 'master' of https://github.com/djaevlen/DickoApp
Changes made by Martin Jespersen (mjatzbox@gmail.com).
Changes made by Martin Jespersen (mjatzbox@gmail.com).