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

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

Conflicts:
	app/js/newbbs-page/main.js
	app/newbbs.html