12062014-1

Added -
- Rup server support
- asp images uploader change (/ prefix omit)
Merge remote-tracking branch 'origin/master'

Conflicts:
	BikeChallengeApp/LogFiles/SelectErrorLog.txt
	BikeChallengeApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache