Changes in working
added in master
more changes
Merge branch 'Working' into testing

Conflicts:
	Branching.v12.suo
	Branching/Web.config
merge
Merge branch 'Working'

Conflicts:
	Branching/Web.config
Merge branch 'master' into testing

Conflicts:
	Branching/Web.config