New changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	itbox/pages/temp/action.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	itbox/pages/temp/action.html