test
Merge branch 'master' of https://github.com/luoyue/act
add something in admin part
download bilongs branch
add admin view part and index part and activity view part
merge with bilong