commit of basic changes 15/06/14
adding updated from nitrous
update nitrous files