pre-adding elements
mid adding new elements
Merge branch 'develop' of github.com:SimonWoolf/websandbox into develop

Conflicts:
	app/assets/javascripts/application.js
	app/views/profiles/show.html.haml