Tested some stuff
Merge branch 'master' of github.com:nodeone/wstory

Conflicts:
	main.less
	server/bootstrap.js
	wunderstory.html
Adjusted search form in header