Clean up repository and trim branches
Implementing the git workflow policy, the repo at leap.se and the leapcode/leap_android repo on GitHub will contain only master and develop branches.
Merge and delete feature branches that are complete
(from redmine: created on 2013-04-28, closed on 2013-04-28)