minimize url
Merge branch 'master' of https://github.com/Azurix78/tweet_academie

Conflicts:
	inc/functions.php
upload image
Merge branch 'master' of https://github.com/Azurix78/tweet_academie