Merge branch 'refs/heads/dev' into release
Fixed controls hidden after ingest bug.
Merge
Upped app version
Added analytics code