OFAndroid: fix resource path detection
Revert "Removed superfluous comment"

This reverts commit e85b645ec06fcd6316d8e40bf44b262a326e36ba.
Revert "ofxNetwork: make copy private, copying these classes will destroy the connection"

This reverts commit 6b5bc2441ed126a2b95ad58065ceea0a596f88b4.
Revert "fixed Thread-safe-fix causing socket to be closed in thread after being accepted"

This reverts commit 6d87010290da9eedf6df1219f84487dd5f744af6.
Revert "Fixed ofxTCPServer being thread-unsafe."

This reverts commit 15b5db432cfee1090fc7a89f77e0a37ce0efaf3a.
added missing files to project generator project
Merge pull request #1927 from elliotwoods/fix-missingFilesInProjectGenerator

added missing files to project generator project
android: several fixes

EGLConfig: better configuration choosing, solves problems with some devices
Data folder detection
loadPercent callback
ofConstants: android detection through __ANDROID__ define
Merge pull request #1929 from arturoc/bugfix-android

android: several bugfixes
Merge branch 'develop' into revert-ofxTCPServer
makefiles: fix PROJECT_EXTERNAL_SOURCE_PATHS
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop
makefiles: fix ALL_OF_PROJECT_SOURCE_PATHS when empty PROJECT_EXTERNAL_SOURCE_PATHS
Merge branch 'develop' into revert-ofxTCPServer
dev scripts: fix nightly builds remove old files + refresh makefiles
dev scripts: fix nightly builds remove old files + refresh makefiles
Merge branch 'revert-ofxTCPServer' into develop
ofxTCPServer: recommit @SoylentGraham fixes
ofxTCPServer: fix number of connected clients
Merge pull request #1931 from arturoc/bugfix-ofxTCPServer

ofxTCPServer: recommit @SoylentGraham fixes