Sliding menu
Merge branch 'master' of
https://github.com/lmartineau/android-listmanager.git

Conflicts:
	List Manager/src/com/iceheart/listmanager/MainActivity.java
Merge branch 'master' of
https://github.com/lmartineau/android-listmanager.git

Conflicts:
	List Manager/res/layout/activity_main.xml
	List Manager/src/com/iceheart/listmanager/MainActivity.java