Merge branch 'master' into dev
Merge branch 'master' into dev
remove freemarker.jar and junit.jar
add free marker and junit in supplementaryLibs
add updateLog
add showmessage parameter in crash handler
update Readme
change uimodule to a separate part
Merge branch 'dev' of https://github.com/cymcsg/UltimateAndroid into dev
update pro guard
update proguard
Merge branch 'dev'