ViewPager
ViewPager v2
Trying commit master
Merge branch 'master' of https://github.com/christor54/Workspace_Marc_Chris

Conflicts:
	DareIt/AndroidManifest.xml
	DareIt/gen/com/example/dareit/R.java
	DareIt/src/com/example/dareit/ConversationsDraft.java
	DareIt/src/com/example/dareit/MainActivity.java