Merged from develop branch

- now v1.3.0
This commit is contained in:
Phil Nash 2015-12-04 10:19:08 +00:00
commit fdc42d0af4
95 changed files with 7680 additions and 2956 deletions

File diff suppressed because it is too large Load diff