stuff
Merge branch 'dev' of github.com:Forthlight/member into dev

Conflicts:
	app/views/member/publications/edit.html.erb