continue upload
Merge branch 'redesign_next' of github.com:zhdk/madek into redesign_next

Conflicts:
	app/views/import/start.html.haml
renaming stuff