Added JCAMP spectrum viewing
Merge branch 'master' of https://github.com/stuchalk/jmcake

Conflicts:
	app/Controller/AppController.php
	app/Plugin/Jmol/Controller/ViewerController.php
	app/Plugin/Jmol/View/Viewer/molecule.ctp
	app/Plugin/Jmol/View/Viewer/spectrum.ctp
	app/Plugin/Jmol/webroot/js/molecule.php
	app/Plugin/Jmol/webroot/js/spectrum.php
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/logs/error.log