Add tBPMN&effektif
Update localStorage usage to avoid collisions with other users
Merge pull request #19 from 120-team/localstorage-collision

Update localStorage usage to avoid collisions with other users
Merge pull request #17 from sebastiankliem/master

Update data for summer term 2014
Minor post-pull-request cleanups.
Merge pull request #18 from flxw/master

Add tBPMN&effektif
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/data.js