small fixes
fixed api call
small fixes
small fix
fixed style.css
fixed json access
Merge branch 'master' of https://github.com/TobiTobsen92/IPED-Development
fast-forward
Merge branch 'develop'
Merge branch 'master' of https://github.com/TobiTobsen92/IPED-Development

Conflicts:
	public/js/remote.js
Merge pull request #1 from TobiTobsen92/develop

Develop