renamed coltrane app to blog
merge branch 'develop' with coltran renamed