Enable to create detail memo. <Must add method merge texture type of bitmap later>
merge
small change
fix conflict
Merge branch 'master' of https://github.com/NextersAppFactory/GodOfMemo

Conflicts:
	GodOfMemo/gen/com/nexters/godofmemo/R.java