Replacing normal URI's with data URI's.
Merge branch 'development'