Merge remote-tracking branch 'origin/master' into sita

Conflicts:
	src/edu/asu/laits/gui/Application.java
	src/edu/asu/laits/model/GraphLoader.java
Added more Activity Logs
Export Solution Bug fix
Merge remote-tracking branch 'origin/bvds' into sita

Conflicts:
	src/edu/asu/laits/gui/Application.java
	src/edu/asu/laits/model/GraphLoader.java
	src/edu/asu/laits/model/LaitsSolutionExporter.java
weirdness
weirdness