Merge pull request #10 from Fritz-Lium/master

mysql test
Merge pull request #11 from Fritz-Lium/master

base frame, test, and simple docs
Merge pull request #12 from Fritz-Lium/master

README.md
edit Android ->.gitgnore
delete some files
delete some file
delete
README.md
wrap BaseActy
exit readme.md
remove defalut icon
edit layout
Merge pull request #13 from Fritz-Lium/master

ignore *.css, using less
Merge pull request #15 from Fritz-Lium/master

add models
edit acty_main layout
Merge branch 'master' of https://github.com/Jayin/SiyuanGroup.git
upload some pic
remove bak files
Update .gitignore
Merge pull request #17 from Fritz-Lium/patch-2

Update .gitignore