Merge branch 'master' of https://github.com/camruny/Escape

Conflicts:
	nbproject/private/private.xml
Sync Commit
Merge branch 'master' of https://github.com/camruny/Escape

Conflicts:
	nbproject/private/private.xml