Merge branch 'choi_dev' of https://github.com/NewBBS/newbbs into test_master

Conflicts:
	app/js/newbbs-page/main.js
	app/newbbs.html
Merge branch 'test_master' of https://github.com/NewBBS/newbbs into test_master
aaaaaaaa
Merge branch 'test_master' of https://github.com/NewBBS/newbbs into test_master

Conflicts:
	app/newbbs.html