Signed-off-by: dwt1987 <dwt1987@163.com>
Signed-off-by: dwt1987 <dwt1987@163.com>
Merge branch 'master' of https://github.com/MonsterStorm/TQM

Conflicts:
	gen/com/actionbarsherlock/R.java
	gen/com/jeremyfeinstein/slidingmenu/lib/R.java
	gen/com/lifesting/mobile/mr/R.java

Signed-off-by: dwt1987 <dwt1987@163.com>