Merge Safari & Blink code

@kpeckett & @Jeremyboy222 

Finally, I've been able to successfully merge Blink & Safari code!
Please test and review the code.
Guys, if you have any questions regarding the code, feel free to ask!

Thanks,
Tomáš