merge
merge
Merge branch 'master' of github.com:erickpeirson/Dolon
Merge branch 'master' of github.com:erickpeirson/Dolon
Merge branch 'master' of github.com:erickpeirson/Dolon
Merge branch 'master' of github.com:erickpeirson/Dolon
Merge branch 'master' of github.com:erickpeirson/Dolon
static and media paths
merge