Merge pull request #55 from kiswa/dev

Merge dev into master
Merge pull request #59 from kiswa/dev

Merge dev into master
Merge pull request #66 from kiswa/dev

Merge dev into master
Update VERSION
Rollback VERSION update - wrong branch again.
Merge branch 'master' into dev

Conflicts:
	VERSION
Merge branch 'dev'
Update VERSION
Merge pull request #85 from kiswa/master

Merge version change from master