滑动切换

有滑动切换功能
内容还不对
Merge branch 'master' of https://github.com/moshenglei/beautifuljournal

Conflicts:
	actionbarsherlock_librarys/actionbarsherlock_library/actionbarsherlock_library.iml
	beautyjournals/beautyjournal/project.properties
	beautyjournals/beautyjournal/res/values/styles.xml