Merge pull request #17 from guestisp/master

Pull request to sync the code
Merge pull request #18 from guestisp/master

Fix Migration
Fix some bug in email tempalte
Correct bug to upgrade when price is without expired
Merge branch 'master' of 192.168.0.24:shineisp
Correct bug for price when do a new order.
- Added the text income summary in the dashboard

Change-Id: I925311379bbe8e3b38b39c54650c67f646885a76
Signed-off-by: ShineISP <info@shineisp.com>
FIx new order notification placeholder
Merge remote-tracking branch 'refs/remotes/shineisp/master'
Fix some indentation
Fix migrations