Started a new branch - testin
* Back to master
in production... go
some work
Track back and commit index.html
Hotfix done
Returned to production after hotfix
finishing is53
Merge branch 'production' into iss53

Conflicts:
	index.html
Work in production.. waiting iss53
Merge branch 'iss53' into production

Conflicts:
	index.html
final touch in testing
conflict resolved
serverfix commit
serverfix commit - another one