Merge remote-tracking branch 'remotes/origin/newbbsDev' into test_master

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

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