Merge branch 'master' into yamamoto/graph
Merge branch 'master' into yamamoto/graph
colorpicker fixed
Merge pull request #242 from ICTKyouikukei2013/kosuke/color

colorpicker fixed
change UPLOAD_FOLDER config
Update portfolio.wsgi
enable to change background height
add close button
add close button
change logo
modify graph
manual merge master
Merge branch 'yamamoto/graph' of https://github.com/ICTKyouikukei2013/portbacker into yamamoto/graph
fix crushing when a goal not having goal items
Merge pull request #248 from ICTKyouikukei2013/kosuke/addlogo

Kosuke/addlogo
Merge pull request #249 from ICTKyouikukei2013/yamamoto/graph

Yamamoto/graph
add close button
Merge pull request #250 from ICTKyouikukei2013/kosuke/addclosebtn

add close button
chenge graph position
Merge pull request #256 from ICTKyouikukei2013/yamamoto/graph

chenge graph position