Ignoring built output.
Merge branch 'box' into develop
Removed cruft.
Merge branch 'develop'