Commits in sdp-fall-14/sdp-fall-14:master