Merge branch 'master' of /home/test/amanaman/amanaman with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	AmanamanProjekt/settings.py
	Evaluation/templates/evaluation.html
	Evaluation/views.py
Merge remote-tracking branch 'origin/master'
renaming stack to tasks;
added reviewlist in evaluation;
huge bug fix in elaboration candidate plus test
Merge remote-tracking branch 'origin/master'
bugfix: unacceptable reviews
EVALUATION fixed a bug in review interaction.
HOME contributed missing u
query improvements and tests
Merge branch 'master' of https://github.com/martflu/amanaman
Merge branch 'master' into slides
bugfix: go back
bugfix: go back
COMMENTS + EVAL fixed two minor css bugs.
Merge branch 'master' of github.com:martflu/amanaman
HOME a little bit of responsive design. now works better for smartphone screens
get awesome elaborations should be fast now