add
add
Merge remote-tracking branch 'origin/master'

Conflicts:
	libs/SlidingMenu-master/library/bin/library.jar
	libs/actionbarsherlock/bin/actionbarsherlock.jar
Merge remote-tracking branch 'origin/master'

Conflicts:
	libs/SlidingMenu-master/library/bin/library.jar
	libs/actionbarsherlock/bin/actionbarsherlock.jar