Add action bar
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
Add action bar
Add Header
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	res/values/strings.xml
	src/com/example/Caldroid/MainActivity.java
scrolling up
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Calendar