Summer Updates#12

lithiagerami wants to merge 2 commits intosteiza:mainsteiza/tinyfeedback:mainfrom

lithiagerami:summer-2015-updateslithiagerami/tinyfeedback:summer-2015-updatesCopy head branch name to clipboard