Creating template
Merge branch 'master' of https://github.com/jfmatth/aim-openshift
Merge branch 'master' of https://github.com/jfmatth/aim-openshift
change upload to remove /loader/ at the end
get the latest
Merge branch 'master' of https://github.com/jfmatth/aim-openshift
Merge branch 'master' of https://github.com/jfmatth/aim-openshift
Merge branch 'master' of https://github.com/jfmatth/aim-openshift
Merge branch 'development' of https://github.com/jfmatth/aim-openshift
remove registration
Merge branch 'django-users2' into cleanup
Merge branch 'master' of https://github.com/jfmatth/aim-openshift
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
fixing the ftp download time due to DST, adjusting the error output