Merge pull request #2 from dungmickey/master

update json
Merge pull request #8 from dungmickey/master

update sort and language
Merge branch 'master' of https://github.com/johnsonpham/SmartPhone
Merge branch 'master' of https://github.com/dungmickey/SmartPhone
Modified   app/index.html
Modified   app/js/lang-en.json
Modified   app/js/lang-fr.json
Modified   app/partials/phone-detail.html
Merge remote-tracking branch 'remotes/dung/master'

Conflicts:
	app/index.html
	app/js/lang-en.json
	app/js/lang-fr.json
Merge pull request #9 from dungmickey/master

update home.css, controller.js, phone_list.html  - merge without preview
Deleted    app/compare.html
Modified   app/css/compare.css
Modified   app/index.html
Modified   app/partials/compare.html
Modified   app/partials/phone-list.html
Modified   app/css/compare.css
Modified   app/partials/compare.html
Modified   app/partials/phone-detail.html
Merge pull request #10 from dungmickey/master

Modified   app/index.html and app/partials/phone-list.html - Merge without preview
Merge branch 'master' of https://github.com/hungpham/SmartPhone
Load data for Compare page
Merge pull request #11 from nhaho/master

Load data for Compare page, update .json language file
Modified   app/css/compare.css
Modified   app/partials/compare.html
Modified   app/partials/phone-detail.html
Modified   app/partials/phone-list.html
Change HTML stucture and style on detail-page from Nha.Ho
Merge pull request #12 from nhaho/master

Change HTML stucture and style on detail-page
add percent and color for value number
Merge pull request #3 from hungpham/master

add percent and color of number comparison
Modified   app/css/compare.css
Modified   app/js/controllers.js
Modified   app/partials/compare.html
Add status progress bar and change color of true/false value
Merge pull request #5 from nhaho/master

Update json for translate