Merge branch 'master' of /home/user1/PycharmProjects/gemafication_mailtp with conflicts.
fix media
add meta, models
Merge remote-tracking branch 'origin/master'