add version info settings
fix something
fix typo
fix something
fix something
change something
add something
mend
mend
Revert "mend"

This reverts commit 479e49edfee6dd073fe7ccc2ccca15fb24fad452.
Revert "mend"

This reverts commit d37542b031bc871e4d1cd703e64aa534d31497d6.
Revert "add something"

This reverts commit 88dae35c8b2286248d345cc29fabf2191b23f71d.
Revert "change something"

This reverts commit 6963baff775ea5a0e2d824db314c4efc74313cf5.
Revert "fix something"

This reverts commit 25771b188a9a08f68ab895c237801fc4c65b8e5d.
Revert "fix something"

This reverts commit 1c500a7dc64f798404780c0aa5fd1839e74057c2.
some changes
Merge remote-tracking branch 'origin/jbtest' into jellybean