Changes to payment instructions
404 Test commit

* Added two line breaks to the end of the 404 page template
Resync
Revert "Resync"

This reverts commit 0be6dbaf2cc8023ae078d173306b9c3c65860cdf.
Updated initial_data.json

Removed item that causes "Email pending error" due to outdated email
message.
Minor changes to external services
Merge branch 'master' of github.com:robogals/myrobogals
Minor change of support link
	new file:   api_1_0/admin.py
	new file:   api_1_0/__init__.py
	modified:   api_1_0/models.py
	modified:   api_1_0/serializers.py
	modified:   api_1_0/views.py
Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	daemons/rgsmsd.h
	myrobogals/fixtures/initial_data.json
	rgtemplates/404.html
	rgtemplates/conf_invoice.html
	rgtemplates/support.html
modified:   api_1_0/admin.py
modified:   api_1_0/models.py
modified:   api_1_0/serializers.py
modified:   api_1_0/views.py
modified:   core/settings.py
Merge pull request #77 from bagzcode/r2d2

update user profile for r2d2