history views
Merge branch 'master' of github.com:Destinycloudfist/vintage

Conflicts:
	Vintage/Vintage.xcodeproj/project.pbxproj
xib updates