Delete .gitignore
reincluding thirdparty sym link
Removing unused replication of resources dir
Merge branch 'master' into Dev-Server

Conflicts:
	.gitignore