Merge pull request #26 from ledgersmb/master

Bringing master up to date.
Fixing approval handling for cogs

--HG--
extra : source : abb4e97ac891449c8f889a93ff79b7b26ee0ac51
Fixing one issue found with assembly/cogs, partially fixing another.

--HG--
extra : source : 105be5f5e8ee6713239debbe29bf1b20674b7478
Fixing inability to add cogs to assemblies

--HG--
extra : source : b13d9b41dad553a5cf9372dd28b6b41b398a0555
Minor docs adjustments and fixes for cogs on assemblies

--HG--
extra : source : 53cb31235bf69b64944620e1a037604469d00f1a
Merge pull request #169 from einhverfr/master

COGS/mfg fixes