General - Incident Detail. Change from "status" to "problem_status"
1.2
Merge branch 'master' of https://github.com/jrzamora510/CNOC.git

Conflicts:
	Cambios/WebContent/js/TableTools/as3/ZeroClipboard.as
	Cambios/WebContent/js/TableTools/as3/ZeroClipboardPdf.as
	Cambios/WebContent/js/TableTools/css/TableTools.css
	Cambios/WebContent/js/TableTools/css/TableTools_JUI.css
	Cambios/WebContent/js/TableTools/images/copy.png
	Cambios/WebContent/js/TableTools/images/copy_hover.png
	Cambios/WebContent/js/TableTools/images/csv.png
	Cambios/WebContent/js/TableTools/images/csv_hover.png
	Cambios/WebContent/js/TableTools/images/print.png
	Cambios/WebContent/js/TableTools/images/print_hover.png
	Cambios/WebContent/js/TableTools/images/psd/copy document.psd
	Cambios/WebContent/js/TableTools/images/psd/file_types.psd
	Cambios/WebContent/js/TableTools/images/psd/printer.psd
	Cambios/WebContent/js/TableTools/images/xls.png
	Cambios/WebContent/js/TableTools/images/xls_hover.png
	Cambios/WebContent/js/TableTools/js/TableTools.js
	Cambios/WebContent/js/TableTools/js/ZeroClipboard.js