merged dev branch

This commit is contained in:
Yves Delley 2014-09-12 22:49:13 +02:00
commit 9bc5b81292
53 changed files with 4920 additions and 2183 deletions

File diff suppressed because it is too large Load diff