Merge pull request #1 from Codingpixels/master

Updating from master copy
Merge pull request #2 from Codingpixels/master

Updating my branch
Order.ctp new update
Merge branch 'origin/master'
Merge pull request #5 from neelbdesai19/master

Updating Master - Order.ctp