Merge remote-tracking branch 'origin/develop'

Conflicts:
	.gitignore
added days on fire screen
fixed some small issues
released version 1.1
Merge branch 'release/v1.1' into develop