2
Merge branch 'master' of https://github.com/RestyArtiaga/OJT_DTR

Conflicts:
	ScrumGzTrack/AndroidManifest.xml
	ScrumGzTrack/bin/AndroidManifest.xml
	ScrumGzTrack/bin/MainActivity.apk
	ScrumGzTrack/bin/classes.dex
	ScrumGzTrack/bin/classes/com/example/adapter/OJTlistAdapter.class
	ScrumGzTrack/bin/classes/com/example/scrumgztrack/MainActivity.class
	ScrumGzTrack/bin/classes/com/example/scrumgztrack/OJTOptionDialog.class
	ScrumGzTrack/bin/classes/com/example/scrumgztrack/R$drawable.class
	ScrumGzTrack/bin/classes/com/example/scrumgztrack/R$id.class
	ScrumGzTrack/bin/classes/com/example/scrumgztrack/R$layout.class
	ScrumGzTrack/bin/classes/com/example/scrumgztrack/R$menu.class
	ScrumGzTrack/bin/classes/com/example/scrumgztrack/R$string.class
	ScrumGzTrack/bin/classes/com/example/scrumgztrack/R$style.class
	ScrumGzTrack/bin/classes/com/example/scrumgztrack/TeamListDialog.class
	ScrumGzTrack/bin/classes/com/example/tabs/OJTlistFragment$RetrieveAllOJT.class
	ScrumGzTrack/bin/classes/com/example/tabs/OJTlistFragment.class
	ScrumGzTrack/bin/classes/com/example/tabs/TeamListFragment.class
	ScrumGzTrack/bin/resources.ap_
	ScrumGzTrack/gen/com/example/scrumgztrack/R.java
	ScrumGzTrack/res/menu/remove_from_team.xml
	ScrumGzTrack/res/values/strings.xml
	ScrumGzTrack/src/com/example/adapter/OJTlistAdapter.java
	ScrumGzTrack/src/com/example/tabs/OJTlistFragment.java
test
changes in changelog