Editing Testimonials View Design
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/styles/LessComponents/Functions.css.map
	app/styles/LessComponents/elements.css.map
	app/styles/animate-view.css.map
	app/styles/animate.css.map
	app/styles/file-upload.css.map
	app/styles/mydetails.css.map
	app/styles/ng-animation.css.map
	app/styles/photos.css.map
	app/styles/profile.css.map
	app/styles/puppies.css.map
git Ignore