-.-
Merge branch 'master' of https://github.com/Codeepy/AdBeaconWeb

Conflicts:
	publish/forms.py
	publish/views.py
Merge branch 'master' of https://github.com/Codeepy/AdBeaconWeb

Conflicts:
	publish/forms.py
	publish/views.py
Merge branch 'master' of https://github.com/Codeepy/AdBeaconWeb
Merge branch 'master' of https://github.com/Codeepy/AdBeaconWeb
Merge branch 'master' of https://github.com/Codeepy/AdBeaconWeb
Merge branch 'master' of https://github.com/Codeepy/AdBeaconWeb
Merge branch 'master' of https://github.com/Codeepy/AdBeaconWeb
Merge branch 'master' of https://github.com/Codeepy/AdBeaconWeb

Conflicts:
	publish/forms.py
	publish/views.py
Merge branch 'master' of https://github.com/Codeepy/AdBeaconWeb
Merge branch 'master' of https://github.com/Codeepy/AdBeaconWeb

Conflicts:
	publish/forms.py
	publish/views.py
Merge remote-tracking branch 'origin/master'