Submission: 28.08.2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.txt