Merge pull request #4 from sammyfung/master

added staff and communities, and minor fixes
Merge pull request #5 from sammyfung/master

CfC allows oversea/global communities as well.
Merge pull request #6 from sammyfung/master

Starting CFP
Merge pull request #7 from sammyfung/master

updated staff list
Merge pull request #8 from sammyfung/master

Modify main page and added background pic and HKOSC logo
Merge pull request #9 from sammyfung/master

removed background pic from staff list page
Merge pull request #10 from sammyfung/master

minor fix on main page
Merge pull request #11 from sammyfung/master

minor fix
Merge pull request #12 from sammyfung/master

fixed overseas and added wanleung to sales team
Fix bootstrap.min.js path error
Merge pull request #13 from serina-hku/master

Fix bootstrap.min.js path error
Add a new volunteer application form to website #14
Merge pull request #15 from serina-hku/master

Add a new volunteer application form to website #14
Adjust button style
Fix typo
Merge pull request #16 from linquize/fix1

Small fix
modified the date of conference 2015, and added venue.
Merge branch 'pr/21'

Conflicts:
	index.html
Merge branch 'pr/21'

Conflicts:
	index.html
Fixed on last merge