add FrOSCon 2014
Merge branch 'master' of github.com:sidux-ev/pressemappe

Conflicts:
	v1.1.0/de/fakten-1.1.0.txt