Updated gitignore
Merge remote-tracking branch 'origin/master' into Authorities

Conflicts:
	.gitignore
Updated AuthorityTest and getMock with authority mock information
Fixed getMock to deal with retrieving authorities