Merge pull request #2 from hungpham/master

get data
Merge pull request #7 from dungmickey/master

1012121
Modified   app/compare.html
Modified   app/css/compare.css
Modified   app/index.html
Modified   app/js/controllers.js
Modified   app/partials/phone-detail.html
Modified   app/partials/phone-list.html
Modified   package.json
Add        app/js/lang-en.json
Add        app/js/lang-fr.json
Add        app/js/vendor/angular/angular-translate.js
Add        app/js/vendor/angular/loader-static-files.js
Merge remote-tracking branch 'remotes/hung/master'

Conflicts:
	app/index.html
	app/js/controllers.js
	app/partials/phone-list.html
Modified   app/index.html
Modified   app/js/controllers.js
Modified   app/js/lang-en.json
Modified   app/js/lang-fr.json
Modified   app/css/home.css
Modified   app/index.html
Modified   app/js/controllers.js
Modified   app/js/lang-en.json
Modified   app/js/lang-fr.json