Updated generator page style
Merge branch 'master' of https://github.com/AdFame/AdFame
Merge pull request #73 from alezucco/master

db and server
Updated preview logic
Merge branch 'master' of https://github.com/AdFame/AdFame

Conflicts:
	public/userinput/userinput.js
Fixed merge conflicts
(bugfix) made the refresh work for the user input field and display area
Updated sliders and generator