changed some props
actual version synchronized
Merge remote-tracking branch 'Upstream/master'

Conflicts:
	.gitignore
.gitignore changes
.gitignore changes
.gitignore changes
Merge branch 'secure_commit'

Conflicts:
	.gitignore
	MIGLogin/MIGMain/nbproject/project.properties
Merge branch 'secure_commit'

Conflicts:
	.gitignore
Added the ability to change between screens
Fixed a NullPointerException that crashed the application befor login was completted.
Merge branch 'hotfix/hotfix-0.1'
actual version
LoginModel SQL Database passwordhash 'BCrypt' implemented
Serverpassword updated
server url updated
Merge branch 'feature/LoginModel' of https://github.com/julses/Mighty-Heroes into intellij

# By Stollebob (5) and Jan (4)
# Via Stollebob (4) and Jan (3)
* 'feature/LoginModel' of https://github.com/julses/Mighty-Heroes:
  Serverpassword updated
  LoginModel SQL Database passwordhash 'BCrypt' implemented
  actual version
  Fixed a NullPointerException that crashed the application befor login was completted.
  Added the ability to change between screens
  .gitignore changes
  .gitignore changes
  actual version synchronized
  changed some props

Conflicts:
	.gitignore
	MIGLogin/MIGMain/src/MIG/ka/bprocess/Common/ViewProperty.java
	MIGLogin/MigXmlRpcServer/src/MIG/ka/bprocess/LoginModel/LoginModel.java
Merge branch 'intellij' into develop

* intellij: (31 commits)
  Serverpassword updated
  LoginModel SQL Database passwordhash 'BCrypt' implemented
  actual version
  Fixed a NullPointerException that crashed the application befor login was completted.
  Quick Hack to demo the LobbyView’s ListBox (modified)
  Added the ability to change between screens
  Quick Hack to demo the LobbyView’s ListBox
  Minimale Korrektur am SQL-Query
  Gewisse Mergetools nehmen sowohl die alte als auch die neue Version und nehmen einfach beide Zeilen rein.
  .gitignore changes
  Git Explode
  Greatet the Controller and Model of the Lobby.
  Can haz moar Menu Views! Wow! Such Views, Much Login!
  Can haz moar Menu Views! Wow! Such Views, Much Login!
  Cleaned up gitignore
  .gitignore changes
  .gitignore changes
  actual version synchronized
  edited .gitignore
  repaired version
  ...
Fixed Screen-Thingies and the Server-Connection-…

…things
Fixed Database Connection to select a database
Enabelt the Client to interact with the main menu and go to lobby screen.