add input newstation/imported stations
Merge remote-tracking branch 'origin/requirejs-integration' into requirejs-integration

Conflicts:
	assets/fonts/reneco-font/fonts/reneco-font.eot
	assets/fonts/reneco-font/fonts/reneco-font.svg
	assets/fonts/reneco-font/fonts/reneco-font.ttf
	assets/fonts/reneco-font/reneco-font.less
	index.html
	js/controller.js
	js/main.js
	reneco-font/fonts/reneco-font.woff