local changes for alex
Merge branch 'stable' of https://github.com/LAL-Apps/Battlehack2014 into stable
pot upload
Merge branch 'stable' of https://github.com/LAL-Apps/Battlehack2014 into stable
Merge branch 'stable' of https://github.com/LAL-Apps/Battlehack2014 into stable
Merge branch 'stable' of https://github.com/LAL-Apps/Battlehack2014 into stable
.