status 11.08.2014
Merge branch 'year3-ipa' of github.com:accompany-cob3-6/accompany into year3-ipa