small txt chg
Main View -- Dashboard. Laid out  all the individual clickable views which takes to a stub view
Main View -- Dashboard. Laid out  all the individual clickable views which takes to a stub view
Adding stub activities
Initial commit. Added RecycleFlow screen with dummy data
Merge pull request #2 from nitinkurian/master

Main Activity
merged changes from Jessica Tyler

Consistency fixes with action bar
additional merged changes from Jessica Tyler
merge changes from matt

Conflicts:
	.gitignore
	.idea/libraries/appcompat_v7_19_1_0.xml
	Recycle Austin/build.gradle
	Recycle Austin/src/main/AndroidManifest.xml
	Recycle Austin/src/main/res/values/strings.xml
	build.gradle
merge changes from matt

Conflicts:
	.gitignore
	.idea/libraries/appcompat_v7_19_1_0.xml
	Recycle Austin/build.gradle
	Recycle Austin/src/main/AndroidManifest.xml
	Recycle Austin/src/main/res/values/strings.xml
	build.gradle
merge changes from matt

Conflicts:
	.gitignore
	.idea/libraries/appcompat_v7_19_1_0.xml
	Recycle Austin/build.gradle
	Recycle Austin/src/main/AndroidManifest.xml
	Recycle Austin/src/main/res/values/strings.xml
	build.gradle
re-added settings.gradle
moved SodaActivity to activity package
Added module for pure-java services
Added support for unit and functional testing
Added example Junit, Androidtestunit, and android functional tests
added project files
Updating to current master version