mass f/r 2013/2014, excluding gondor related files for now
modify README
Merge branch 'develop' into feature/6-basic-tests

Conflicts:
	README