Fixed #36

+ Formation edge fade
+ Fix up calculations for formation/extra units
+ extraUnit fixes
Merge branch 'master' into gh-pages

Conflicts:
	css/global.css
	js/min/game.min.js