Merge branch 'stage'
precompile assets
added belongs_to user
fixed merge conflict