a;lskdjf
Build
Merge remote-tracking branch 'origin/master'

Conflicts:
Revert "Took out 4.6 specific stuff"

This reverts commit 3edac619149bdcfa6ea68d416ee3805072166aa6.

Conflicts:
	Assets/TestScene.unity
Merge branch 'master' of https://github.com/jkcorrea/GenericSpaceShooter

Conflicts:
	Assets/Standard Assets/Character Controllers/Sources.meta
	Assets/Standard Assets/Character Controllers/Sources.meta~origin_master
meta