Edits to views.py
Merge branch 'master' of https://github.com/fephsun/orgo
Fixed a thing
Merge branch 'master' of https://github.com/fephsun/orgo
Merge branch 'master' of https://github.com/fephsun/orgo
...
Merge branch 'master' of https://github.com/fephsun/orgo

Conflicts:
	views.py
Merge branch 'master' of https://github.com/fephsun/orgo
...
Merge branch 'master' of https://github.com/fephsun/orgo
...
Merge branch 'master' of https://github.com/fephsun/orgo
Merge branch 'master' of https://github.com/fephsun/orgo
Merge branch 'master' of https://github.com/fephsun/orgo
Merge branch 'master' of https://github.com/fephsun/orgo
Fixed problem with multiple reagent problem generation