Changing admin.py and some html files
Merge branch 'master' of https://github.com/vunhatminh241191/buddyup

Conflicts:
	buddyup/pages/admin.py
	buddyup/pages/eventinvitations.py
	buddyup/pages/form_profile.py
	buddyup/static/css/bootstrap.css
	buddyup/templates/group/invite.html
	buddyup/templates/layout.html
	buddyup/templates/my/view_invite.html
	buddyup/templates/setup/landing.html
Changing