some notes.
overide conflic
launcher.xml notes
Merge branch 'master' of https://github.com/linsea/LauncherJellyBean.git

Conflicts:
	src/com/launcherjellybean/android/PagedView.java