iteration #2
Merge branch 'bugfixes'

Conflicts:
	app/views/admin/Analysiss/list.html