Mentors merge all PRs from Week 3 to Branch "GSoC17"

[mayburgos]

Description

As an Admin,
I want to download the current code,
so that I can perform user tests and check on the end result.

Mocks

N/A

Acceptance Criteria

• All PRs have been reviewed by at least 1 mentor.
• Code merged into the correct branch "GSoC17"
• When possible, create a release file is provided in the repo.

Definition of Done

• Week 3's code is able to be downloaded from the GSoC17 Branch in the project's repo.

Estimation

• 0.5 Hours

[sunjunkie]

Completed. Several previous PRs were incorrectly merged into develop branch so I merged develop into GSoC17 branch. GSoC17 should be current now.