pull commit
Merge branch 'master' of https://github.com/syupein/oct.git

Conflicts:
	src/main/java/model/NoteSettingBean.java
簡単ノート作成作成
Merge branch 'master' of https://github.com/syupein/oct.git

Conflicts:
	src/main/webapp/sidemenu.jsp