worked on list
Merge branch 'master' of https://github.com/ckristo/WAE-CM-SS2014-G1

Conflicts:
	csdr-g1/conf/routes