Merge pull request #29 from rinkalvictor/master

fresh_return chart
Merge pull request #30 from rinkalvictor/master

report 15/04
Merge pull request #31 from rinkalvictor/master

fresh return scratch report generation 16/04/2014
Merge pull request #32 from rinkalvictor/master

fresh return 18/04
Merge pull request #33 from rinkalvictor/master

sales report 23/04
CakeDesktop inclusion
Merge pull request #34 from rinkalvictor/master

config changes
Debug kit inclusion and Session changes
Merge remote-tracking branch 'rkabhib/master'

Conflicts:
	app/Controller/AppController.php
	app/Controller/EmployeeOrdersController.php
	app/Resources/release_1.1.sql
Merge pull request #35 from sdubey-codingpixels/master

Test changes
Merge pull request #13 from Codingpixels/master

updating from master