Merge branch 'patelsan-master'
ignore xml
header
Merge branch 'patelsan-master'
Merge branch 'master' into patelsan-master

Conflicts:
	.gitignore