Baystation12/Baystation12 — pull request #6801 by Ravensdale (2014-10-19 21:59:27+00:00)
Title: Dev -> Kunpeng merge

Updates the kunpeng branch with dev branch, deleted items that broke map file.