Merge branch 'master' of https://github.com/rubr0negr0/Noveleira-ios

Conflicts:
	Noveleira/Pods/Pods.xcodeproj/project.pbxproj
ner