Merged Ol3 with master, add extra parameter for mobile optional layers
Fix merging problems
Fix merging problems