Merge https://github.com/fabiogermann/ps1-airticket

git-svn-id: https://napoli.zhaw.ch/svn/ps_12_gruppe11/trunk@7 3fd0b478-4a88-46a2-8858-9e02464ffc28
structure

git-svn-id: https://napoli.zhaw.ch/svn/ps_12_gruppe11/trunk@8 3fd0b478-4a88-46a2-8858-9e02464ffc28
Merge branch 'master' of https://github.com/fabiogermann/ps1-airticket