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

Conflicts:
	.gitignore
Merge remote-tracking branch 'Dennis/master' into secure_commit
.gitignore changes
.gitignore changes
Cleaned up gitignore
.gitignore changes
Merge branch 'secure_commit'

Conflicts:
	.gitignore
	MIGLogin/MIGMain/nbproject/project.properties
Can haz moar Menu Views!
Wow! Such Views, Much Login!

ListBox-Doku: http://sourceforge.net/apps/mediawiki/nifty-gui/index.php?title=Standard_Controls_ListBox
Can haz moar Menu Views!
Wow! Such Views, Much Login!

ListBox-Doku: http://sourceforge.net/apps/mediawiki/nifty-gui/index.php?title=Standard_Controls_ListBox
Merge branch 'master' of https://github.com/derintendant/Mighty-Heroes-Development

* 'master' of https://github.com/derintendant/Mighty-Heroes-Development:
  Can haz moar Menu Views! Wow! Such Views, Much Login!
Greatet the Controller and Model of the Lobby.
Git Explode
.gitignore changes
Merge branch 'secure_commit'

Conflicts:
	.gitignore
Merge branch 'secure_commit' of https://github.com/Stollebob/Mighty-Heroes

# By Stollebob
# Via Stollebob
* 'secure_commit' of https://github.com/Stollebob/Mighty-Heroes:
  .gitignore changes
  Git Explode
  Greatet the Controller and Model of the Lobby.
  edited .gitignore

Conflicts:
	.gitignore
	MIGLogin/MIGMain/assets/Interface/LobbyScreen.xml
	MIGLogin/MIGMain/assets/Interface/LoginScreen.xml
	MIGLogin/MIGMain/assets/Interface/MenuScreen.xml
	MIGLogin/MIGMain/nbproject/build-impl.xml
Gewisse Mergetools nehmen sowohl die alte als auch die neue Version und nehmen einfach beide Zeilen rein.
Minimale Korrektur am SQL-Query