Merge pull request #43 from danuzclaudes/development

11/19/2014 Master - Development
My main page edit
Merge pull request #44 from 54wang17/development

My mainpage edit
Merge pull request #45 from danuzclaudes/OrderDevelopment

Order development
Merge pull request #46 from danuzclaudes/master

Master