Merge pull request #47 from upgle/develop

Bootstrap v3.1.1 Update
Merge pull request #49 from upgle/develop

Develop
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge branch 'master' into develop