fixing toolbar
Merge remote-tracking branch 'upstream/master' into configurable_error_highlight
Merge pull request #1056 from diegosarmentero/configurable_error_highlight

Configurable error highlight
fixing pep8
Fixed Issue #1050
Merge pull request #1057 from diegosarmentero/mom_im_in_a_string

Mom im in a string
Fixed Issue #1051
Fixed Issue #1043
Merge pull request #1059 from diegosarmentero/master

fixing regex in python_syntax for def and class
Fixed Issue #1039
Fixed Issue #1032
Fixed Issue #1030
Fixed Issue #1028
Fixed Issue #1022
Fixed Issue #976
Fixed Issue #967
Merge pull request #1068 from diegosarmentero/master

fixing highlighter
Merge pull request #1058 from diegosarmentero/unindent_tabs

Fixed Issue #1051
Merge pull request #1060 from diegosarmentero/sort_projects

Fixed Issue #1043
Merge pull request #1061 from diegosarmentero/collapse_if_while

Fixed Issue #1039