Add scroll view
Merge branch 'dev_1.0_issue37' into dev_1.0

Conflicts:
	CrazyAlarm/bin/R.txt
	CrazyAlarm/gen/com/facebook/android/R.java
	CrazyAlarm/gen/com/grouapp/crazyalarm/R.java
	CrazyAlarm/src/com/grouapp/crazyalarm/MainSettingsFragment.java