Let's suposse that is a bugfix :p
Let's supose that is another bugfix :p
Merge branch 'dev'
Adding new features
Adding more and enw features on these files.
Merging conflicts into master branch