some problems
Merge branch 'master' of https://github.com/robie2011/fhnw14-ecnf.git