change data format
Merge branch 'develop' of https://github.com/tomaash/chrome-angular-skeleton into develop

Conflicts:
	code/html/templates/popup.html
	code/js/modules/background/controllers/popupctrl.js
Merge branch 'develop' of https://github.com/tomaash/chrome-angular-skeleton into develop

Conflicts:
	code/html/templates/popup.html
	code/js/modules/background/controllers/popupctrl.js
Merge remote-tracking branch 'origin/develop' into develop