Merge branch 'develop'

Conflicts:
	.gitignore
	Added A.
	new date A
blah

xxx