Updated nothing, syncronized own repo.
Merge remote-tracking branch 'jreal4/master'
Merge remote-tracking branch 'jreal4/master'
Added lightning attribute.
Merge remote-tracking branch 'Ryan_Hammett/master'

Conflicts:
	RPG/.settings/com.google.appengine.eclipse.core.prefs
	RPG/war/WEB-INF/lib/appengine-api-labs.jar
	RPG/war/WEB-INF/lib/appengine-endpoints-deps.jar
	RPG/war/WEB-INF/lib/appengine-endpoints.jar
	RPGModelClasses/src/com/jreale4/RPG/shared/MoveType.java