Addeded Python 3.4.1 and Django 1.7
Merge branch 'dev'

Conflicts:
	usr/opt/python.tar.gz