Identifier check
Merge branch 'master' of https://github.com/Gatzy118/gonephishing

Conflicts:
	GonePhishing/Models/GPMedia.m
Merge pull request #22 from Gatzy118/nick

Nick