minor changes
Merge branch 'master' of https://github.com/enaqx/411_web

Conflicts:
	public/css/stylesheet.css
Implement react-bbotstrap components