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
Changes to ROI calculation
Merge branch 'development' of https://github.com/jfmatth/aim-openshift