merging branches
updating source
Merge branch 'staging'

Conflicts:
	.gitignore