Upgraded TinyMCE to 4.0.16 (Bug #1282341)

Also changed image popup plugin (used in Journal) to be an actual plugin
which should be easy to integrate into other pages

Change-Id: If57572f34afb1ac4abf012bab32a3966dcfd41ce
Signed-off-by: Jono Mingard <jonom@catalyst.net.nz>
Merge "Upgraded TinyMCE to 4.0.16 (Bug #1282341)"