Merge branch 'master' of github.com:mixotroph/FUB_SWP-2013
irgnore tilde dazu
Merge branch 'master' of github.com:kartner/FUB_SWP-2013

merge
useless txt for frame changed