Initial commit

Change-Id: Icfe6f15e867f87638c95083c8f5f4f0526867ef2
Signed-off-by: panacotta <alejoar@gmail.com>
Merge remote-tracking branch 'origin/master'