Merge pull request #2 from dungmickey/master

Please merge my files
Merge pull request #3 from nhaho/master

Compare page
just for test l10n and locale
Merge branch 'master' of https://github.com/hungpham/SmartPhone

Conflicts:
	app/index.html
modify index.html
update json

update price for mobile
Merge pull request #4 from johnsonpham/master

update json
Merge pull request #2 from nhaho/master

Merge pull request #1 from dungmickey/master
test
jk
Merge branch 'master' of https://github.com/dungmickey/SmartPhone
nm
change index.html
update json

change price for motorola zoom x
Merge pull request #5 from dungmickey/master

Merge pull request #1 from dungmickey/master
Merge pull request #6 from johnsonpham/master

update json
Merge pull request #2 from hungpham/master

get data