support for oauth
fixed default configuration to account.lab.fi-ware.org
Merge branch 'master' of https://github.com/SmartInfrastructures/filab-style-app

Conflicts:
	app/assets/stylesheets/fi_lab_app/appmenu.css
	app/assets/stylesheets/fi_lab_app/filab-style-app.css
	app/views/layouts/fi_lab_app/_header.html.erb
	app/views/layouts/fi_lab_app/application.html.erb