Update 25/10/2014

Modified main and project file updates.