Merge remote-tracking branch 'gargoyle/master'

Conflicts:
	full-build.sh
	package/gargoyle/files/www/basic.sh
	package/gargoyle/files/www/js/basic.js
Merge remote-tracking branch 'gargoyle/3g'

Conflicts:
	full-build.sh
	package/gargoyle/files/www/basic.sh
	package/gargoyle/files/www/js/basic.js
Revert "fix typo"

This reverts commit d994d66ac821c0dd6ed9eae5cb01243190b3acd9.
Revert "Revert "fix typo""

This reverts commit c6855c635994df894e98335eb0d613b4f0fc88d7.
Merge remote-tracking branch 'gargoyle/3g'
Fix typo
Merge remote-tracking branch 'gargoyle/3g'
Merge remote-tracking branch 'gargoyle/3g'
Merge remote-tracking branch 'gargoyle/master'
Resolve conflict
Merge remote-tracking branch 'gargoyle/master'
Merge remote-tracking branch 'gargoyle/master'
Merge remote-tracking branch 'gargoyle/master'
Merge remote-tracking branch 'gargoyle/master'
Fix a condition to compare default product id and switched product id on startup
Merge remote-tracking branch 'gargoyle/master'
Merge remote-tracking branch 'gargoyle/master'
Fix typo
Merge remote-tracking branch 'gargoyle/master'
Merge remote-tracking branch 'gargoyle/master'