add fixes to ihaveaspace and add form to ineedaspace
Merge branch 'master' into addinghtml

Conflicts:
	app/views/activities/new.html.erb
	app/views/layouts/application.html.erb
	app/views/pages/index.html.erb
	app/views/spaces/new.html.erb
Merge branch 'master' of https://github.com/Harveynglish/freespace