Merge remote-tracking branch 'origin/master' into develop
test commit
test...
...
Merge branch 'develop'
Merge branch 'master' of https://github.com/TobiTobsen92/IPED-Development

Conflicts:
	public/js/remote.js