Merge remote-tracking branch 'upstream/develop' into develop
Missing && typo
Merge pull request #1201 from byteGator/Missing-&&-

Missing && typo
issue #1196 and some optimizations
Merge pull request #1203 from conejoninja/runalert

issue #1196 and some optimizations
changed version to 3.3.0
Merge branch 'develop' of github.com:conejoninja/Osclass into develop
Merge pull request #1204 from conejoninja/develop

Develop
some fixes on update process
removed osc_doRequest in upgrade proces, we need to find a better solution
Merge pull request #1205 from conejoninja/develop

Develop
Typo and logic
More logic
Merge remote-tracking branch 'upstream/develop' into develop
minor minor improvements
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #1211 from conejoninja/uptemp

Uptemp
i18n some strings
Merge pull request #1212 from osclass/i18n-ajax-upload

i18n some strings
missing to load hLocation