changed where files are

merge commit
Merge branch 'master' of https://github.com/mattiasLindbladHiQ/SL_HiQ

Conflicts:
	HiQ_TimeToGo/Scripts/app.js