Merge branch 'master' into interim

Conflicts:
	.gitignore
	Gemfile.lock
working interim state
trying to push to heroku
pulls latest changes
comments the wmd part
resolving for heroku, removed non asci chars
frontend in progress
still working
home page slideshow
Merge branch 'herokub' into frontend
trying to setup home page