Merge branch 'master' into testing
Merge branch 'master' into testing
Layout update
Merge branch 'master' into testing

Conflicts:
	views/layout.jade
Fixed layout.jade
Merge branch 'master' into testing

Conflicts:
	app.js
	public/javascripts/ajax.js
	public/javascripts/startscript.js
	routes/images.js
	views/index.jade
	views/layout.jade
Revert "Merge branch 'master' into testing"

This reverts commit efb34b6c1aedba87b1e951c35f5fa95f544677cb, reversing
changes made to 45fcd81f40cde1647bb55dcc45f9af55759a3808.
Updated structure and removed components directory

- neue Struktur bei JavaScript files
- bower_components und components directory zusammengeführt und
components entfernt
Added HTTPS server capability
Merge branch 'testing'