Commit 20140530111400 by martin
Merge branch 'master' of https://github.com/martinverdejo/parkingapp
Merge branch 'master' of https://github.com/martinverdejo/parkingapp