Disabled armies options for army lists creation
Display army list unit size even if unique
Merge remote-tracking branch 'origin/master' into rails4

Conflicts:
	app/models/army.rb