merged release_v1.0.0 into master

This commit is contained in:
Lorenz Meier
2015-06-30 15:30:45 +02:00
23 changed files with 1085 additions and 105 deletions
File diff suppressed because it is too large Load Diff