Updating IntelliJ config to work on 5.0.x branch
First version of upload to modeling commons

Conflicts:
	src/main/org/nlogo/app/FileMenu.java
Moved libs to MClibs folder

Conflicts:
	.idea/codeStyleSettings.xml
	.idea/libraries/all.xml
Added permissions selection
Added upload model image functionality - currently have image from current view and image from file, still need auto-generate image functionality
Added autogeneration of preview images capability
Added ability to create user accounts
Added ability to update models, cleaned up code, fixed threading issue with network requests, fixed sbt build dependencies problems

Conflicts:
	.idea/libraries/all.xml
	project/build/Libraries.scala
Renamed dialog box classes
Switched from testing server url to modeling commons url, should probably make this so no recompile is required
Cleaned up some code

Conflicts:
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientAbortMethod.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientAuthentication.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientChunkEncodedPost.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientConnectionRelease.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientCustomContext.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientCustomSSL.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientEvictExpiredConnections.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientExecuteDirect.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientExecuteProxy.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientFormLogin.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientGZipContentCompression.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientInteractiveAuthentication.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientKerberosAuthentication.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientPreemptiveBasicAuthentication.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientPreemptiveDigestAuthentication.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientProxyAuthentication.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ClientWithResponseHandler.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/ProxyTunnelDemo.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/client/QuickStart.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/conn/OperatorConnectDirect.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/conn/OperatorConnectProxy.java
	MCLibs/httpcomponents-client-4.2.1/examples/org/apache/http/examples/entity/mime/ClientMultipartFormPost.java
	MCLibs/httpcomponents-client-4.2.1/tutorial/html/advanced.html
	MCLibs/httpcomponents-client-4.2.1/tutorial/html/authentication.html
	MCLibs/httpcomponents-client-4.2.1/tutorial/html/caching.html
	MCLibs/httpcomponents-client-4.2.1/tutorial/html/connmgmt.html
	MCLibs/httpcomponents-client-4.2.1/tutorial/html/css/hc-tutorial.css
	MCLibs/httpcomponents-client-4.2.1/tutorial/html/fluent.html
	MCLibs/httpcomponents-client-4.2.1/tutorial/html/fundamentals.html
	MCLibs/httpcomponents-client-4.2.1/tutorial/html/httpagent.html
	MCLibs/httpcomponents-client-4.2.1/tutorial/html/index.html
	MCLibs/httpcomponents-client-4.2.1/tutorial/html/preface.html
	MCLibs/httpcomponents-client-4.2.1/tutorial/html/statemgmt.html
	MCLibs/json_simple-1.1-all/.classpath
	MCLibs/json_simple-1.1-all/.project
	MCLibs/json_simple-1.1-all/AUTHORS.txt
	MCLibs/json_simple-1.1-all/ChangeLog.txt
	MCLibs/json_simple-1.1-all/README.txt
	MCLibs/json_simple-1.1-all/build.xml
	MCLibs/json_simple-1.1-all/doc/json.lex
	MCLibs/json_simple-1.1-all/src/org/json/simple/ItemList.java
	MCLibs/json_simple-1.1-all/src/org/json/simple/JSONArray.java
	MCLibs/json_simple-1.1-all/src/org/json/simple/JSONAware.java
	MCLibs/json_simple-1.1-all/src/org/json/simple/JSONObject.java
	MCLibs/json_simple-1.1-all/src/org/json/simple/JSONStreamAware.java
	MCLibs/json_simple-1.1-all/src/org/json/simple/JSONValue.java
	MCLibs/json_simple-1.1-all/src/org/json/simple/parser/ContainerFactory.java
	MCLibs/json_simple-1.1-all/src/org/json/simple/parser/ContentHandler.java
	MCLibs/json_simple-1.1-all/src/org/json/simple/parser/JSONParser.java
	MCLibs/json_simple-1.1-all/src/org/json/simple/parser/ParseException.java
	MCLibs/json_simple-1.1-all/src/org/json/simple/parser/Yylex.java
	MCLibs/json_simple-1.1-all/src/org/json/simple/parser/Yytoken.java
	MCLibs/json_simple-1.1-all/test.xml
	MCLibs/json_simple-1.1-all/test/org/json/simple/Test.java
	MCLibs/json_simple-1.1-all/test/org/json/simple/parser/YylexTest.java
Making stuff work
Auto-change to primary IntelliJ run config
Merge branch '5.0.x' of github.com:NetLogo/NetLogo into commons-5.0.x
Merge pull request #1 from TheBizzle/commons-5.0.x

Modeling Commons 5.0.x
Added comments in library file to note packages that are used exclusively for Modeling Commons
Fixed the following: bug when typing quickly into existing model search field, bad indentation, intellij comments, spacing, segmented ModelingCommons.java, maked casts look pretty, cleaned up use of default access modifier, switched use of iterators to for each, changed app to use dependency injection instead of compiled dependency on MC package/class, added copyright info to files, added comments for empty catch blocks
Cleaned up dialog boxes, removed IntelliJ dependency for Dialog boxes, updated documentation and license info
Updated documentation
Removed intelliJ line from build.sbt dependencies, reordered GUI form code