First commit
add ignore files
adding calendar intent and test
merged from master
minor fix for package names
merged from master
minor fix for package names
Merge branch 'master' of https://github.com/naveenad/noppa

Conflicts:
	noppa/src/com/aalto/noppa/CourseListFragment.java
Merge branch 'master' of https://github.com/naveenad/noppa

Conflicts:
	noppa/src/com/aalto/noppa/CourseListFragment.java
Merge branch 'master' of https://github.com/naveenad/noppa

Conflicts:
	noppa/AndroidManifest.xml
	noppa/src/com/aalto/noppa/MainActivity.java
Merge branch 'master' of https://github.com/naveenad/noppa

Conflicts:
	noppa/AndroidManifest.xml
	noppa/src/com/aalto/noppa/MainActivity.java
Merge branch 'master' of https://github.com/naveenad/noppa

Conflicts:
	noppa/src/com/aalto/noppa/CourseDetailFragment.java
local
Merge branch 'master' of https://github.com/naveenad/noppa

Conflicts:
	noppa/src/com/aalto/noppa/CourseDetailFragment.java
	noppa/src/com/aalto/noppa/FavCourseActivity.java
Merge branch 'master' of https://github.com/naveenad/noppa

Conflicts:
	noppa/src/com/aalto/noppa/CourseDetailFragment.java
	noppa/src/com/aalto/noppa/FavCourseActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	noppa/src/com/aalto/noppa/FavCourseActivity.java