Merge branch 'master' of https://github.com/jonasbusk/saas2014

Conflicts:
	doc/report/main.tex