Merge branch 'release/1.0'
Merge branch 'release/1.1'
added .gitignore
updated gitignore to exclude files in the .idea package
.gitignore should be working now
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	.gitignore
readme.md
1.2 -> 1.3
Merge branch 'release/1.3' into develop