Merge skwp/master into lfilho/neobundle

Merge skwp/master into lfilho/neobundle