Merge branch 'master' of /Users/genesis/PycharmProjects/dodream with conflicts.
ADD website & move academy