some clean up
some cleanup
Merge branch 'develop'
Merge branch 'develop'
make a advanced edit text in editactivity, to display images immmediately
Merge branch 'develop'
 fix bugs
Merge branch 'develop'
new flyme branch
fix some bugs
modify the git ignore
Merge branch 'flyme' of https://github.com/djj0809/MyCC98 into flyme