Merge branch 'develop' of https://github.com/Silex/openalpr into develop

Conflicts:
	src/openalpr/regiondetector.cpp

src/openalpr/config.h

@@ -17,11 +17,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #ifndef CONFIG_H
 #define CONFIG_H
 
-
 #include "simpleini/simpleini.h"
 #include "support/filesystem.h"
 
@@ -91,7 +89,6 @@ class Config
     int postProcessMinCharacters;
     int postProcessMaxCharacters;
 
-
     bool debugGeneral;
     bool debugTiming;
     bool debugStateId;
@@ -125,5 +122,4 @@ class Config
     bool getBoolean(string section, string key, bool defaultValue);
 };
 
-
 #endif // CONFIG_H