Flags removed.
Merge branch 'remove-flags' into removed-flags

Conflicts:
	src/org/grid/agent/sample/SampleAgent.java
Merge branch 'remove-flags' into removed-flags

Conflicts:
	src/org/grid/agent/sample/SampleAgent.java
Test comment 2..
Resolved merge issue SampleAgent