proton 2016-03-22

@geksilla: I think now that we have a better commit scheme, we don't need to use the git pr auto merge anymore

using a normal merge when the branch is fast forwarded creates a nice entry in the commit log instead of a ugly merge commit

what do you think?

@dvcrn: agree, I like the cherry pick way