added timer to scattershot
added researching text above player
Merge branch 'master' of https://github.com/DannyPaguiao/Orbion

Conflicts:
	Orbion.gmx/objects/player.object.gmx

merged with daniel's orbshot commit
added timer to scattershot and orb research
displays "researching" text in green above the player's head